Merge Android Pie into master

Bug: 112104996
Change-Id: Ied0d54d4ff268d4bb4ad9f9e655bac8916c9f7b2