Merge "Update ripple mask when invalidated" into sc-dev am: 6836ab86 am: 3b74a0f7 am: 0f12cb13

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

Change-Id: I8a56592bdf88fa722d92977c25178982a3c0862d