Merge Android Pie into master

Bug: 112104996
Change-Id: Ic2bc822c2597ad48e81bb018d215b784b18f76fe