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

Bug: 180401296
Merged-In: Iceabdce06b1db670b9b46c63f47138aab6893126
Change-Id: I508a80a50ec419fd59c85328f1c008e0f7d782a9