Android 13.0.0 release 15
Merge cherrypicks of [19534729] into tm-d1-release.

Change-Id: Ia42036576588ee27ed7b1962dbc20525a82f694a