Merge Android Pie into master

Bug: 112104996
Change-Id: I61757fda78b0f72d99bac9e54aa0c7d5b7ea3a60