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

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



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