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

Bug: 180401296
Merged-In: I9c7e20eb6843b648770759dc2769275ea39232d5
Change-Id: I584897197eaf6661d94b6012fc2118ab6f7f85a3