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

Merge "Merge "ColorSchemeTransition now updates the ripple color" into tm-dev am: a776c954 am: a20ff4d4" into tm-d1-dev-plus-aosp am: 8eff304f

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



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