Merge Android Pie into master

Bug: 112104996
Change-Id: I71e842bdd4d34a7aa54e6038c528543bacd58522