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