Android 7.1.2 Release 39 (5787804)
Merge commit 'b760a3bb' into aug10d-nyc-mr2-dev

Bug: 111085900
Change-Id: Ie12be47f760402566801eb42f5defa0611a51ca2
(cherry picked from commit 6d489a5f574013d22fe16af00464cc1e9eaf0616)
1 file changed