Merge Android Pie into master

Bug: 112104996
Change-Id: Ia3c4089c78713adfe6a2aef6428bcb5a8a9737c0