Merge Android Pie into master

Bug: 112104996
Change-Id: Iedc3f77794a2adcd4dd40d063bfee0f99f92e42b