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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If77c45731d85f983573da7f05dcc1fd912a2be9c