Merge Android Pie into master

Bug: 112104996
Change-Id: If7bba1133ed2fef69205ab44f390a079e8136b05