Merge f9ae1804 ("Merge tag 'for-v6.7' of...

Merge f9ae1804 ("Merge tag 'for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply"

) into android-mainline

Steps on the way to 6.7-rc1

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