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

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



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