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: 1032a557 am: 918423ed

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



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