Merge 0cc82d61 ("Merge branch 'for-5.16/nintendo' into for-linus") into android-mainline

Steps on the way to 5.16-rc1

Resolves conflicts in:
	drivers/hid/Kconfig
	drivers/hid/hid-ids.h
	drivers/hid/hid-nintendo.c

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