Android S Preview 1
DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I84b3f43dd187e541a0b93698b92cc46be37bc755
Change-Id: I0d5c9025b94a4f5245a473399d9f795e3cbbf30a