Merge Android Pie into master

Bug: 112104996
Change-Id: I707d201c4bd141d381dff936fb36598a423fc0e6