Merge Android Pie into master

Bug: 112104996
Change-Id: If9ec488844d477df25896fcc957c54ee203c564b