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

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



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