Android CTS 11.0 Release 15 (11399258)
Merge "Merge cherrypicks of ['android-review.googlesource.com/2945105'] into sparse-11392770-L78600030001796530. SPARSE_CHANGE: Icf51069c27d79557ec2dfa6462da1a557a717e48" into sparse-11392770-L78600030001796530