Merge Android Pie into master

Bug: 112104996
Change-Id: Ia35666c12a910b891115379867b7a6c8e9e5f4bd