Merge Android Pie into master

Bug: 112104996
Change-Id: If42b29fd0033adeda494ea89003f7b776e72330f