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

Bug: 180401296
Merged-In: I0eb6566ca8e1c7c70cc3f830f9829c081bb86a1a
Change-Id: I434602f2b411a1908c16d1bfb5a89f70630b2717