Merge Android Pie into master

Bug: 112104996
Change-Id: I8f2aaac2e559b4ad5ba621a2415490b0cd688e3e