Merge f8824e15 ("Merge tag 'sound-6.5-rc1' of...

Merge f8824e15 ("Merge tag 'sound-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound"

) into android-mainline

Steps on the way to 6.5-rc1

Resolves merge conflicts in:
	sound/soc/soc-core.c

Change-Id: I7ccca749fd53b51e2d2903770ddd1ed1fa28856e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>