Merge branch 'android12-5.4' into android12-5.4-lts

Sync up with android12-5.4 for the following commits:

0ed90f62 UPSTREAM: ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF
95647568 UPSTREAM: usb: gadget: f_hid: fix f_hidg lifetime vs cdev
72f75ab3 UPSTREAM: usb: gadget: f_hid: optional SETUP/SET_REPORT mode
99372dba ANDROID: add TEST_MAPPING for net/, include/net
cf79cfed UPSTREAM: nfp: fix use-after-free in area_cache_get()
d4e7e088 UPSTREAM: proc: avoid integer type confusion in get_proc_long
972bdcf1 UPSTREAM: proc: proc_skip_spaces() shouldn't think it is working on C strings
a8ba091b ANDROID: usb: f_accessory: Check buffer size when initialised via composite

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