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

Change-Id: I72c76ebc1e5830c5267d3381186b7029b9c191ab