Android VTS 14.0 Release 4 (11681991)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24461948'] into udc-release.

Change-Id: I10607f2e2443f7be22c25c87281f20346bf2ae25