Merge Android Pie into master

Bug: 112104996
Change-Id: Ic9fa8871b8e89e3633be17b0013cada8bfbb70d1