Merge Android Pie into master

Bug: 112104996
Change-Id: I7a1304ad10b32fc737a657e9848ee87505bb6f95