Android 13.0.0 Release 8 (TP1A.221005.003)
Merge cherrypicks of [19716434] into tm-release.

Change-Id: Iff84f429e9f7a14fd813ce4065d9d01c3d5f058d