Merge "Fix colors for dreams settings according to new spec" into udc-dev am:...

Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de2 am: bece3e4b am: 439cdd90 am: f3c0f501

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741



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