Merge Android Pie into master

Bug: 112104996
Change-Id: I293f57d92d5ab13a8ec47db97b32069dcf4caaf8