Merge Android Pie into master

Bug: 112104996
Change-Id: I6b4ff3c2b74d83ea2d53516a0a99a349661f5c07