Merge Android Pie into master

Bug: 112104996
Change-Id: If475bd23f609a2910df5ac8e0c8464971fed1a7a