Merge "Reset patterned animations when solid ripple is reset" into sc-dev am: 70c0c93542 am: da8be68189

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

Change-Id: Iab3fa2527f759990a99e412384c99680e7003cac