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

Change-Id: I21424d5cda3cd0a526c4be6c788033e6c4ac30c4