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

Change-Id: I9cd45e3fd256d5fae107683f9182b77b90c41670