Android 7.1.2 Release 12 (N2G47W)
Merge "Merge upstream 0.165 SHA '203f0a3'"