Merge Android Pie into master

Bug: 112104996
Change-Id: Ife26a62a004cc7153634b9e2f6ca9a1c805a91a3