Merge "Cleanup dream complication setting to reflect single toggle users see...

Merge "Cleanup dream complication setting to reflect single toggle users see in Settings." into tm-qpr-dev am: e16a86cf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19699462



Change-Id: I95e0810838925833e869ed171bdafdd4b34dfe87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>