Android 14.0.0 release 36
[coastguard skipped] Merge sparse cherrypicks from sparse-11348124-L64500030001487463 into 24Q1-release.

COASTGUARD_SKIP: I9419fb78ad58be717fb9fd8c1602cd8472b145ff
COASTGUARD_SKIP: I02429876790a6456ca957ff7c38f0c8bf88127f9

Change-Id: I9d559fdf4547c7ccc5a13c3731a53d1cec143e10