Merge Android Pie into master

Bug: 112104996
Change-Id: I60d8fa4030df37ee48507b34df4c77f542e9c89a