Merge "Fix ripples not going away" into sc-dev am: 0d5d58a15f am: e2459ddba9 am: b5f595ce21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002973 Change-Id: I5086251994b0e1d00cc9478ce3f63d7333658268
This commit is contained in: