Merge Android Pie into master

Bug: 112104996
Change-Id: I62d104d01694286943c463b1b5fcd06e58c9305d