Merge Android Pie into master

Bug: 112104996
Change-Id: Ib34e4c6cf033cd092ac0c1b489258083e24f951d