Android VTS 13.0 Release 1 (TP1A.220624.020)
Merge cherrypicks of [19293650] into tm-release.

Change-Id: Ib18812a44586d4742221aac383d9d8f028c505a4