Android CTS 8.0 Release 22 (6199430)
Merge "Merge cherrypicks of [1232633, 1232634, 1232635, 1232636] into sparse-6140868-L41500000459044442" into sparse-6140868-L41500000459044442