Android VTS 15.0 Release 1 (AP3A.240905.015.A2)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27489988'] into 24Q3-release.

Change-Id: I0c4aa2817e7afc743ed121877092bb02a697277a