Merge "Derestrict RippleDrawable.mState." am: b698722956 am: f11b14dfe0 am: 6d1ff42ee6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I370ce36e69b1daf56762eb2184ff780ff77e862b