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" into udc-d1-dev am: bf784bdf

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



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