Merge Android Pie into master

Bug: 112104996
Change-Id: Ie760d204144a01ad1ad2495c2b9edad71d3ccd37