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

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

Change-Id: I2216b55386c2e1b720c96ed86a19712aad1d3cbc