Android CTS 14.0 Release 4 (11801623)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24377542'] into udc-release.

Change-Id: Ic7cec439f1c54dbe26d1f29a620e04273e489ff9