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

This does a backmerge of branch android12-5.4 into branch
android12-5.4-lts to catch up on the commits made there.  Included in
here are the following commits:

* 70fafe09 Merge tag 'android12-5.4.274_r00' into android12-5.4
* 8322246e UPSTREAM: selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
* 51cf29fc ANDROID: 16K: Fix show maps CFI failure
* 02cd5dce ANDROID: 16K: Handle pad VMA splits and merges
* e6f64b8b ANDROID: 16K: madvise_vma_pad_pages: Remove filemap_fault check
* 846aa404 ANDROID: 16K: Only madvise padding from dynamic linker context
* 9fb7a320 ANDROID: 16K: Separate padding from ELF LOAD segment mappings
* ba4c2f63 ANDROID: 16K: Exclude ELF padding for fault around range
* c600556a ANDROID: 16K: Use MADV_DONTNEED to save VMA padding pages.
* c7cd106c ANDROID: 16K: Introduce ELF padding representation for VMAs
* 020928f4 ANDROID: 16K: Introduce /sys/kernel/mm/pgsize_miration/enabled
* 2d5d8240 UPSTREAM: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
* 272e5eaf UPSTREAM: netfilter: nf_tables: release batch on table validation from abort path
* 002e7f61 UPSTREAM: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout

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