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

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



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