Android 13.0.0 release 61
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23231044', 'googleplex-android-review.googlesource.com/23396010'] into tm-qpr3-release.

Change-Id: I6544305ee5683900820194a11c27015fc5e84cef