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

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

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