Android VTS 17.0 release 1
Merge cherrypicks of ['googleplex-android-review.googlesource.com/39251720'] into 26Q2-release.

Change-Id: I482f03806d164554d1355af1cb7293eb87aec5ba