Merge "Derestrict RippleDrawable.mState." am: b698722956

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I920ff7900dfad6bc1496cd88b894c4ef71dfb1c9