Merge Android Pie into master

Bug: 112104996
Change-Id: I2e8e55d6a1dab733f69220053bd6a075450f25ff