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

Change-Id: I46444e69819e9acba008693dd7f6128846b6a689