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

Bug: 172690556
Merged-In: I709657f2c365a07311485adde9306d4a9508be00
Change-Id: Idc64e1c47ec4fa10e552d3e9bdf778d210ba7e02