Android 13.0.0 release 19
Merge cherrypicks of [20450284] into tm-qpr1-release.

Change-Id: I993be5ad6c04aded1e84c46c4efa2634555e11ab