Android VTS 14.0 Release 2 (11117384)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23845447'] into udc-release.

Change-Id: I1c5dd79fee1ab7c9ab184da910c356727bdb8791