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

Bug: 180401296
Merged-In: I6657e1cdcb836d87fc62f92d0f8705dad94fb510
Change-Id: I1ca4dee70ec490a5eef0f048fcfd1aca2302b7f0