Android 13.0.0 Release 53 (TQ3A.230605.010.A1)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22609236'] into tm-qpr3-release.

Change-Id: I8f60657c4b670bd473696a67c7d6311791030572