Android S Beta 3
Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: If3eeb5f43ea6e9adf9e1d9d1d7e199c01ec4f1b5
Change-Id: I93cce73e18e634b28995519b6bdb1b9d19608924