Merge Android Pie into master

Bug: 112104996
Change-Id: If0792b50c7a65f6adb4a43a8a87130b7189d9b4d