Merge Android Pie into master

Bug: 112104996
Change-Id: I1d1b5eb25fc84707c0f1e1150440ae70b8625858