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 am: 784bfb0f am: 09ec6b30

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



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