Merge Android Pie into master

Bug: 112104996
Change-Id: Ic67722ea0afbed6605297d869e73f9ee546e4595