Android 13.0.0 Release 31 (TP1A.221005.002.B2)
Merge cherrypicks of [19355927] into tm-release.

Change-Id: Ida922191df514cf25b6299614dc0d99a7f4cd5ea