Merge Android Pie into master

Bug: 112104996
Change-Id: Ibd803d90d8b30246b5d9481b9a0ae8287a4aa459