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

This is a backmerge of the recent commits from android11-5.4 into
android11-5.4-lts.  Included in here are the following commits.

* 85547bc0 Merge tag 'android11-5.4.274_r00' into branch 'android11-5.4'
* 519c36cd UPSTREAM: selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
* f952d4f3 ANDROID: 16K: Fix show maps CFI failure
* ecba20dd ANDROID: 16K: Handle pad VMA splits and merges
* 7231bbf0 ANDROID: 16K: madvise_vma_pad_pages: Remove filemap_fault check
* 95ac7272 ANDROID: 16K: Only madvise padding from dynamic linker context
* 1375f832 ANDROID: 16K: Separate padding from ELF LOAD segment mappings
* 6ad75e7a ANDROID: 16K: Exclude ELF padding for fault around range
* 0f0e4aae ANDROID: 16K: Use MADV_DONTNEED to save VMA padding pages.
* 05f9de39 ANDROID: 16K: Introduce ELF padding representation for VMAs
* c54460e9 ANDROID: 16K: Introduce /sys/kernel/mm/pgsize_miration/enabled
* a563a5f0 ANDROID: GKI: add snd_compr_stop_error to Xiaomi_abi
* 70c18002 UPSTREAM: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
* a0aeb467 UPSTREAM: netfilter: nf_tables: release batch on table validation from abort path
* ba915b85 UPSTREAM: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
* 66f4b04c FROMLIST: binder: check offset alignment in binder_get_object()

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