Merge Android Pie into master

Bug: 112104996
Change-Id: Ia50af15c2dbe544047e806de7d0ecff91385bf2c