Merge Android Pie into master

Bug: 112104996
Change-Id: I41b420ac3b1fec12cb9f1948057ade925779689c