Merge Android Pie into master

Bug: 112104996
Change-Id: Id20a3559cdd321b76de720e82c29cac0cc7abfdf