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

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

Change-Id: Ida1cd932e30ad2ddf58c309cac9c2fd1ed849b6a