Merge Android Pie into master

Bug: 112104996
Change-Id: Ifa3c915de2eea7588a604045640b2b541087d96b