Android VTS 16.0 Release 1 (BP2A.250605.031.A2)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32799199'] into 25Q2-release.

Change-Id: I53c81f56907c0b68bdb4376b1cede8abc75ebadc