Android CTS 7.1 Release 24 (5131712)
Merge "Merge upstream 0.165 SHA '203f0a3'"