Merge Android Pie into master

Bug: 112104996
Change-Id: Idf2aae2065bdc23cb8eba307abf53aeceb8d5224