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

Change-Id: Id3bfd5247d157526c8e0761a890b7deea2df544a