Merge Android Pie into master

Bug: 112104996
Change-Id: Ie82f235c874d7047e32f3d33acd660441cef3464