Merge 85a2c56c ("Merge tag 'pm-5.10-rc6' of...

Merge 85a2c56c ("Merge tag 'pm-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm"

) into android-mainline

Steps on the way to 5.10-rc6

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