Merge Android Pie into master

Bug: 112104996
Change-Id: I01ad0e4da9dd7931603231ebb0ce4d982c7b83b5