Android 13.0.0 release 14
Merge cherrypicks of [19534835, 19716778] into tm-d1-release.

Change-Id: Ifa4085d2f4a891eab1dc01975ba9abd7dbc89488