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

COASTGUARD_SKIP: Ic0577e88d28cc263e6e76a92e8883ddfa11fa89e
COASTGUARD_SKIP: Id8ea0acdb67b2c939ee622e98a5d49fe89622a51
COASTGUARD_SKIP: I213ce7fd602a692b3bd28c00638fb1e0660dedc5


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