Merge "Adding Material Color Tokens to Android" into udc-dev am: d2b13f41

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



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