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

Change-Id: I14410136ead97e78683dd38841f27159ce8443e7