Merge Android Pie into master

Bug: 112104996
Change-Id: I8402a013c2121613d154a84655bc42d0ae7150bf