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

This catches the android12-5.4-lts branch up to the recent changes done
in the android12-5.4 branch.  Included in here are the following
commits:

* 6b0e3b1e Merge tag 'android12-5.4.278_r00' into android12-5.4
* 132aa489 ANDROID: 16K: Don't set padding vm_flags on 32-bit archs
* 3ffe89ed ANDROID: GKI: refresh ABI to include kimage_vaddr
* 27edab2f BACKPORT: arm64: move kimage_vaddr to .rodata
* 968b3652 BACKPORT: arm64: kernel: Convert to modern annotations for assembly data
* 58de0940 ANDROID: fix kernelci build breaks due to hid/uhid cyclic dependency
* 4275fce9 Merge tag 'android12-5.4.276_r00' into android12-5.4
* 51e9abf6 UPSTREAM: af_unix: Fix garbage collector racing against connect()

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