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

Change-Id: I82285109818b179e75ad668bdd2c970311925a2f