Merge Android Pie into master

Bug: 112104996
Change-Id: I8bd346b0164280d47158507f97cef0934f4d1905