[coastguard skipped] Merge sparse cherrypicks from sparse-12841252-L50700030009804848 into android14-gs-pixel-6.1-trunk-release.

COASTGUARD_SKIP: Idf422eda6cf9d189d0126986bedf7cc85e1dca87
COASTGUARD_SKIP: If04adddc4ee62a03cd22a775433bcbdfa82c277f
COASTGUARD_SKIP: I3931bd02cbd68e66ceecc33edc2cefdbfbecc703
COASTGUARD_SKIP: I313c3eed9981789b99ead00e7dfd936d82240a86


Change-Id: I382dbb5e7438c0ca037cacbb44c4a35e725531fe
Signed-off-by: Coastguard Worker <[email protected]>