Android CTS 15.0 Release 1 (AP3A.240905.015.A2)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28172376'] into 24Q3-release. Change-Id: Ic8d1854219bc6e202e66f96b868c1534df148bfd