Merge Android Pie into master

Bug: 112104996
Change-Id: I7f86f50ff9a100921c2a1afe34b12b8cc1304e9f