Android 13.0.0 release 23
Merge cherrypicks of [20451479] into tm-qpr1-release.

Change-Id: I503f15c816c33a6e2fa7660afe2dcd6c06dacd5c