Android 13.0.0 Release 54 (TQ3A.230605.012.A1)
[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L49900000960778179 into tm-qpr3-release.

COASTGUARD_SKIP: I2f9275ef117caa93c09d4d24e3a17f588e4ca600
COASTGUARD_SKIP: Icacd1e2d988c1aa101c3b2a992242ba220673603

Change-Id: Id61e2801d1b46e9f5e2e55ddb681c9f09f82bd88