Android S Preview 1
Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I47a4cf22fe9810c157b653687151055a39a8f6ac