Merge Android Pie into master

Bug: 112104996
Change-Id: I49e765d5af9bbac1d72d8570af2f0a7fcdef0beb