Merge Android Pie into master

Bug: 112104996
Change-Id: Ic305c39426720cb43cb7050bf02a4a3657306475