Merge Android Pie into master

Bug: 112104996
Change-Id: Icb7cf76bc97e423a4cff040b8a2800c679e6cb51