Android 13.0.0 release 34
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21091560'] into tm-qpr2-release.

Change-Id: I3c4506dd06c6d9c185c699d63297f4fe586ab843