Android CTS 11.0 Release 12 (10119570)
Merge "Merge cherrypicks of ['android-review.googlesource.com/2586248'] into sparse-9883162-L55200000960621909. SPARSE_CHANGE: I4bc46e45c14e892723c0ed4304c4c56bc3a172f5" into sparse-9883162-L55200000960621909