Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f am: 65c8f6bcc6 am: da2d82c1f2

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

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