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

Change-Id: Ifdc77f6cbef3faaca8301b17fd11895153ca6556