Merge "ColorSchemeTransition now updates the ripple color" into tm-dev am:...

Merge "ColorSchemeTransition now updates the ripple color" into tm-dev am: a776c954 am: d13590e6

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



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