Merge Android Pie into master

Bug: 112104996
Change-Id: I38d5b10220684f653dfb8c7c9a1264eb67bc44fd