Merge Android Pie into master

Bug: 112104996
Change-Id: Id547347c690f84ad2939ef18816786e52f5705ea