Merge Android Pie into master

Bug: 112104996
Change-Id: I6cd098b3a5db4e862bdc3e960b162810ce1005e2