Android 9.0.0 release 52
resolve merge conflicts of 72b6ac9075afff486072049416d38b44c046c9f2 to pi-dev

Test: compile
Bug: 138802882
Change-Id: I4e077177577e7d583754f3e3d55c507aeb83b5fb
Merged-In: I59b297642d2000dde0a83f77b20112c7382b7ef1
(cherry picked from commit 02e896c5f86ced36e127dac4bccc7743bb29ac77)
1 file changed