Merge 72030621 ("Merge tag 'tty-5.18-rc1' of...

Merge 72030621 ("Merge tag 'tty-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty"

) into android-mainline

Steps on the way to 5.18-rc1

Resolves merge conflicts with:
	drivers/tty/serial/Kconfig

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