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

Bug: 172690556
Merged-In: If519752201f61bb36d8a96620d07327b3f6f8f02
Change-Id: I6506eb0eaacce92d87e72e52122f615665053522