Android 13.0.0 release 57
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21224930', 'googleplex-android-review.googlesource.com/20659351'] into tm-d3-release.

Change-Id: I199d39d1203df6060e5b1bd9812e927dc76577be