Merge Android Pie into master

Bug: 112104996
Change-Id: Ibda46522d646c0a391c7d19663e4ffdb3d4b30fc