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

Bug: 172690556
Merged-In: Icc69137c6d2e5118096a4f3661273d96952a18c6
Change-Id: I02d44f20ab70395ffb303c1e629723368bafd8af