Merge Android Pie into master

Bug: 112104996
Change-Id: I89d5ffc94b34b086ce94da79fb4211d4197f65da