Android 13.0.0 release 23
Merge cherrypicks of [20052859, 20101176, 20111292] into tm-qpr1-release.

Change-Id: I46bcae045dc32d4a51f4ed962bff9436f168e8db