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

Bug: 180401296
Merged-In: I1b7fe671562def65f089094e56fda09deb14bd7b
Change-Id: I2176bced10ddb56f23fd683c42f12712d85218db