Merge Android Pie into master

Bug: 112104996
Change-Id: I402929a060bee2fb9e8f4a277b5eb6bdb7f5984c