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

Bug: 180401296
Merged-In: I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254
Change-Id: I0c74791d944d31f5c2d67aab6cba15bfd8792b9b