Merge Android Pie into master

Bug: 112104996
Change-Id: I5447db16c4a3de84ffdd199337678460289306ff