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

Change-Id: I238cbbc0a63e8c282d79e50a22c394cd9dc039ef