Android 13.0.0 release 4
Merge cherrypicks of [19034069, 19194541] into tm-release.

Change-Id: I5fe69b3f90b8feea172d4e5962844731a457fe70