Merge Android Pie into master

Bug: 112104996
Change-Id: Ifb46b0964766723246c85a96d37732c38531e896