Android 13.0.0 Release 7 (TP1A.221005.002)
Merge cherrypicks of [19631317] into tm-release.

Change-Id: I078f8bf81f0b41350a3f0d0d5d993d799e487874