Merge Android Pie into master

Bug: 112104996
Change-Id: Ic12d3fab61c0ee634f0a98ff9121e97e9cafff18