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

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



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