Merge Android Pie into master

Bug: 112104996
Change-Id: If5c595a523f58a9ee90037ff03c0b8143104f6de