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

Change-Id: I87787ef2c28ae2424aaf68b329cdea2946497a87