Android 13.0.0 release 44
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21302719', 'googleplex-android-review.googlesource.com/21310726'] into tm-qpr2-release.

Change-Id: I4ffbdccf0d7e84d33d1c7a443c441b2fe47599e2