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

Bug: 180401296
Merged-In: I34aab72dc94ef82be99b3665e792d9eee2a3fc73
Change-Id: Ia8d56d97c8c56c60694989c8c1300720cf4a2bb3