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

Change-Id: Id15506acc10a6f49397be2d467ea74e024cb4210