Merge Android Pie into master

Bug: 112104996
Change-Id: I4ab67e82b596008eabe205e81013008f955c51c1