Android CTS 10.0 Release 2 (5995686)
Merge "Merge cherrypicks of [1162147, 1162148, 1162149, 1162150, 1161853] into sparse-5935223-L94700000387356965" into sparse-5935223-L94700000387356965