Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: 69a8e59f33

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

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