Merge Android Pie into master

Bug: 112104996
Change-Id: Id6d60235794bbea4c1f9274d5265da8817dca243