Merge Android Pie into master

Bug: 112104996
Change-Id: I0cdacaa011ce25b0f1b6909eda07343d4cac9ed4