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

Bug: 180401296
Merged-In: I608635cd98125d36eca71737585ad2dfedd9a6d7
Change-Id: I0e2fe37c78d539fd7698fd35f805b10609f7888f