Merge Android Pie into master

Bug: 112104996
Change-Id: I2a007561615d5eba4c175116dca80e58b0c8ff1e