Merge Android Pie into master

Bug: 112104996
Change-Id: I02dd89ce091229eeff2791dfa2a9c8d573977e04