Merge Android Pie into master

Bug: 112104996
Change-Id: I63af017a79eace7c00ebcfd602d1c60ff233eff6