Merge Android Pie into master

Bug: 112104996
Change-Id: I110b508de124016501bc62120163c58633857438