Merge Android Pie into master

Bug: 112104996
Change-Id: Icbf4dc432576d78e43292873bd93c500aa3333b4