Merge Android Pie into master

Bug: 112104996
Change-Id: I4930d57cc584503a8e16e2b69549efb5780faad8