Android 13.0.0 release 80
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23497644'] into tm-qpr3-c-release.

Change-Id: I4b66fcff2eac34ac363204d15fdf229c1f9b14d0