Merge Android Pie into master

Bug: 112104996
Change-Id: Id90a990ad0c6b8fcce63c4c374ee7296cd3f574a