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

Sync up with android11-5.4 for the following commits:

63fec064 ANDROID: ABI: Update allowed list for QCOM
dca02b19 ANDROID: GKI: Update abi_gki_aarch64_cuttlefish
b4e51836 ANDROID: GKI: Update abi_gki_aarch64_exynos

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