Merge Android Pie into master

Bug: 112104996
Change-Id: I09815defa261b1e4ca66af384acdfb6b6cb7f9bb