Merge "Merge "Do not add suffix to fixed colors" into udc-dev am: 5a024a35...

Merge "Merge "Do not add suffix to fixed colors" into udc-dev am: 5a024a35 am: 77c185d8 am: cd31059a" into udc-qpr-dev-plus-aosp am: c8d68522

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



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