Merge Android Pie into master

Bug: 112104996
Change-Id: I8472e263b260d8e0cd257f02abbdfb349e995ad1