Merge branch 'android11-5.4' into branch 'android11-5.4-lts'

Do a backmerge to catch up with the recent changes in the android11-5.4
branch.  Included in here are the following commits:

56e07d95 Merge tag 'android11-5.4.278_r00' into android11-5.4
adc9210e ANDROID: 16K: Don't set padding vm_flags on 32-bit archs
dc138528 ANDROID: GKI: refresh ABI to include kimage_vaddr
9ace17ce BACKPORT: arm64: move kimage_vaddr to .rodata
db0d3aee BACKPORT: arm64: kernel: Convert to modern annotations for assembly data
7f5fa807 ANDROID: fix kernelci build breaks due to hid/uhid cyclic dependency
6aff87f4 Merge tag 'android11-5.4.276_r00' into android11-5.4
5727972f UPSTREAM: af_unix: Fix garbage collector racing against connect()

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