Merge branch 'android14-6.1' into branch 'android14-6.1-lts'

This syncs up the -lts branch with the changes in the non-lts branch,
specifically needed for the ABI symbol updates to allow the build
servers to keep running properly.

Included in here are commits:
* df1cdb0a ANDROID: Update the pixel symbol list
* 66cd99cc BACKPORT: UPSTREAM: phy: qcom-qmp: Introduce Kconfig symbols for discrete drivers
* a70d3b7b ANDROID: GKI: add symbols of vendor hooks to ABI for swapping in ahead
* d4db0d5d ANDROID: GKI: add vendor hooks for swapping in ahead
* fd40c1d9 ANDROID: add 16k targets for Microdroid kernel
* 82bf9e76 FROMGIT: BACKPORT: mm/cma: fix placement of trace_cma_alloc_start/finish
* 800cac4b FROMGIT: wifi: nl80211: Extend del pmksa support for SAE and OWE security

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