Merge Android Pie into master

Bug: 112104996
Change-Id: Idf7d81f369ca80575139101aa88daa6171d8800b