Merge Android Pie into master

Bug: 112104996
Change-Id: Ibb53ff4cd1a1df5d7888209e0d98189c66af9860