Android 13.0.0 release 79
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23764853', 'googleplex-android-review.googlesource.com/23916075'] into tm-qpr3-release.

Change-Id: I3876a1c36c3b39d116bf8afac671d4ca2967e051