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: 5352493d am: d3f5aee2

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

Change-Id: Ib4fdd51340f0cc935ccd47007fe73fc4a7c017bd