Merge Android Pie into master

Bug: 112104996
Change-Id: Iff9d707922eedd2ba2f83ae679fc7259f8f877c9