Android CTS 14.0 Release 4 (11801623)
Merge cherrypicks of ['android-review.googlesource.com/3040835'] into sparse-11681991-L88500030003556042.
SPARSE_CHANGE: I90dff2fff2295bc550337d1468127fe8a5368086

Change-Id: I3781fdb784ac8ea3de997c72822fb41f1cd4e46c