Merge b35b6d4d ("Merge tag 'pm-5.17-rc1' of...

Merge b35b6d4d ("Merge tag 'pm-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm"

) into android-mainline

Steps on the way to 5.17-rc1

Resolves conflicts in:
	drivers/cpufreq/Makefile

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