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

COASTGUARD_SKIP: I22ebbfff7db1797137cf181f20a02835828f615e
COASTGUARD_SKIP: I36b1d0f907238210c08781a12bba7f2dcdbed973


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