Merge Android Pie into master

Bug: 112104996
Change-Id: Ia560f566f920ec33a00c74c751319acde0d7bc33