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

Bug: 180401296
Merged-In: If69a9cbbdf06c0a06a8639afaad8d8b18691b455
Change-Id: If4ce4b2d40557dec1c027b1ac4a8b6e3af213674