Android 7.1.2 Release 6 (NHG47K)
Merge "Merge upstream 0.165 SHA '203f0a3'"