Merge Android Pie into master

Bug: 112104996
Change-Id: If4a4f3c2e473a2d60d56ee48fe278abfe4e03af0