Merge Android Pie into master

Bug: 112104996
Change-Id: Icf411d8b04e12dd33dd82a26328b4156585cb5ff