Merge Android Pie into master

Bug: 112104996
Change-Id: Id14d159801662039153d76c10c99108d5d725e4d