Merge Android Pie into master

Bug: 112104996
Change-Id: Ie05d3082adfc859729dfd395e80c597fe4e5e496