Merge Android Pie into master

Bug: 112104996
Change-Id: I5dce2e47525c73ead5e9ab39fa21f55b3a13cee8