Merge Android Pie into master

Bug: 112104996
Change-Id: Ic00524e8aebe77b55a213ac0783911b7902c88f9