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

Sync up with android11-5.4 for the following commits:

274fdbe8 ANDROID: ABI: Update allowed list for QCOM
5b622f9f ANDROID: GKI: Update abi_gki_aarch64_exynos
fa50448d ANDROID: GKI: enable CONFIG_SUN4I_TIMER
034d5a95 ANDROID: uid_sys_stats: report uid_cputime stats in microseconds
068c7df5 ANDROID: ABI: Update allowed list for QCOM
b7b866b3 UPSTREAM: Documentation: arm64: document support for the AMU extension
57ab6489 UPSTREAM: arm64/kvm: disable access to AMU registers from kvm guests
0611858d UPSTREAM: arm64: trap to EL1 accesses to AMU counters from EL0
30bf0431 BACKPORT: arm64: add support for the AMU extension v1
12212948 UPSTREAM: block: fix get_max_io_size()
37201331 ANDROID: ABI: Update allowed list for QCOM
6d9ab208 FROMGIT: Input: Add devices for HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE

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