Merge Android Pie into master

Bug: 112104996
Change-Id: I480e20c33df62a374afad6f81ef1154112732a24