Merge Android Pie into master

Bug: 112104996
Change-Id: I722816616ab2becfd328485c0a10da0351a29ca3