Merge Android Pie into master

Bug: 112104996
Change-Id: I3f4009522092d37adb598c40860d7e202486502f