Merge Android Pie into master

Bug: 112104996
Change-Id: I9f44ac393dae2143b6865d8513ddc65685054d54