Merge "Incorrect chromas for color roles that are using the neutral palette "...

Merge "Incorrect chromas for color roles that are using the neutral palette " into udc-dev am: bb1953c7 am: db315850

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



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