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

Bug: 180401296
Merged-In: I3439554b22936589354c8459cfd1cf8c07adad3d
Change-Id: I2300bd7019b4a423026e0817b0636799e23a6542