Merge "Update ripple mask when invalidated" into sc-dev am: 6836ab86

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

Change-Id: I952693bca604c81efc775a2fc079288c8cf3b46c