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

COASTGUARD_SKIP: I5d65b1884458a0b38248a70fec02cd1f61fd8ed1
COASTGUARD_SKIP: Ied2220e796850c16a8ebcfcec3a55b9b5bc76f12


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