Merge "Base color API updates" into tm-qpr-dev am: ec1d4f483d

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

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