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

Bug: 180401296
Merged-In: I270b10a5f8bbc2357569fc5743807d1266b280bc
Change-Id: Ib23ed7fbec8635f8d39267f17d573ac82433ac89