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

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



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