Merge Android Pie into master

Bug: 112104996
Change-Id: I580114994f0ef38b0b77488bf2594fbdd4f6449b