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: 0ff016cb am: c3284ad3

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



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