Merge Android Pie into master

Bug: 112104996
Change-Id: I0f6f7aa7c077f35e5ef70e8aa54171b2d8d2b784