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

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



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