Merge cec24b8b ("Merge tag 'char-misc-6.4-rc1' of...

Merge cec24b8b ("Merge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc"

) into android-mainline

Steps on the way to 6.4-rc1

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