Merge Android Pie into master

Bug: 112104996
Change-Id: I53eab9cd8b5e6203f6d03e4c7471221ce2504fdb