Merge Android Pie into master

Bug: 112104996
Change-Id: I5786617e5db720dc171326bfbf52920d6b88abf3