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

Change-Id: I63081d0e45d43297f79c840e922f189d7ebe3501