Merge Android Pie into master

Bug: 112104996
Change-Id: I7586b33e1e0b589416cd5e3bb1a76d8231e2ed1d