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

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

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

Change-Id: I46c735c527598dc34e6b7746f15d1d295c76d16e