Merge Android Pie into master

Bug: 112104996
Change-Id: Ie2624c6441794dca713344a4120d8996a16e158d