[coastguard skipped] Merge sparse cherrypicks from sparse-12243400-L20500030006066341 into android14-gs-pixel-6.1-24Q4-release.

COASTGUARD_SKIP: Ie5edfa840bca1a36c33242cee9d761df90c73e97
COASTGUARD_SKIP: If946d0fe849a277fe54c19ae7f607109f9ceb8f2


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