[automerger skipped] Merge "Allow separate configuration of display color...

[automerger skipped] Merge "Allow separate configuration of display color fade" into udc-qpr-dev am: 7d9ba800 am: 970564e2 -s ours

am skip reason: Merged-In I2369d10c293d7b05d55878a28f702a81428ddd15 with SHA-1 5979e99d is already in history

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



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