Merge Android Pie into master

Bug: 112104996
Change-Id: Ib4e0727e11c2e8d5c2c58256d4b770b0d858e0ce