Merge Android Pie into master

Bug: 112104996
Change-Id: Iecf8fe2d79bc56804f547fa7f1afdb68c3956630