Merge "Update Quick Settings Disclosure for watch." into oreo-cts-dev
am: f8fa49b52f

Change-Id: Ifb76499c0a2608a9fe3e1017bb82f2bfa78547b6