Merge Android Pie into master

Bug: 112104996
Change-Id: I2d009e7c4f1ee466a475faf36d6a09b06399cd0c