Merge "Reset patterned animations when solid ripple is reset" into sc-dev am: 70c0c935 am: da8be681 am: 0dbaf445

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

Change-Id: I34d822c9f548716095db3ff48c574b3527334aa7