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

Change-Id: Id5ab5e041c245a18aba1c763baac1ff4609f26df