Merge Android Pie into master

Bug: 112104996
Change-Id: Id6b6c101cd3a966aa1f7b3200f7e5f78b6fa2261