Android 13.0.0 release 15
Merge cherrypicks of [19300203, 19912227] into tm-d1-release.

Change-Id: I778e4cb8292b2eb78c4d80f151d369737d25964a