Merge Android Pie into master

Bug: 112104996
Change-Id: I64fe1e213b04b7851e06963827264ba68df753a8