Merge Android Pie into master

Bug: 112104996
Change-Id: I6508b8d65254ce3058f61b2970cfe887378ec611