Merge Android Pie into master

Bug: 112104996
Change-Id: Ide1d2cf2be579ef0f313c7cd52bb505ed62593e3