Android S Preview 1
Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iee1f809cebd602fa209dc0554ffc11aeb5706d34