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

Bug: 180401296
Merged-In: If548db397f638d37b2ed722a008bb8b039d34afe
Change-Id: I9acd6696342c5b21152a8131a4fd87ba7426913f