Merge Android Pie into master

Bug: 112104996
Change-Id: I1f82ee071741fa55928581a0c27ac3014c0ba78d