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

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



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