Merge Android Pie into master

Bug: 112104996
Change-Id: I84946d59ea5fc9606615daab6030bc888ab541b0