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

Bug: 180401296
Merged-In: I383807d7e5648f2420e41525d9551780657c0da9
Change-Id: I1a478cec325643e722cc38d57efa0a631eb8b6ab