Android 13.0.0 Release 3 (TP1A.220624.021.A1)
Merge cherrypicks of [19460750] into sparse-8877034-L44100000955712235.

Change-Id: Ided8a9550038a4256f6ae5307c30e43697ce054f