Merge Android Pie into master

Bug: 112104996
Change-Id: I13b5bc9804c30ef00b58c2ec03705ff7b5937ad8