Android 13.0.0 Release 2 (TP1A.220624.021)
Merge cherrypicks of [19339743] into tm-release.

Change-Id: Iefbb9de0fec6f7f146a06f48ad92813bf41f8e5d