Merge Android Pie into master

Bug: 112104996
Change-Id: Iedd4a8fe7ef0233a4395c8c269b80b52b6a97acd