Android 13.0.0 release 83
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23452552', 'googleplex-android-review.googlesource.com/23556079'] into tm-qpr3-release.

Change-Id: Ic16f282126f87789a231088023cde646f2a2bc7a