Merge Android Pie into master

Bug: 112104996
Change-Id: I21bbf02f32d84ab13824cdbf99fdea208f5f27d2