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

Sync up with android11-5.4 for the following commits:

7d99cf8c ANDROID: GKI: Update abi_gki_aarch64_exynos
5f273643 UPSTREAM: HID: make arrays usage and value to be the same

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