Merge Android Pie into master

Bug: 112104996
Change-Id: Id3f1f5950e3abad06e0b3c39c6a8bbd09c78de02