Merge 49c13ed0 ("Merge tag 'soc-fixes-6.0-rc7' of...

Merge 49c13ed0 ("Merge tag 'soc-fixes-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc"

) into android-mainline

Steps on the way to 6.0-final

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