Merge Android Pie into master

Bug: 112104996
Change-Id: Ifac5de9f4e53f31ed992e4a2658f8d8a991c3b20