Merge "Merge "Fix RippleDrawable alpha" into udc-dev am: 0814c2dd am:...

Merge "Merge "Fix RippleDrawable alpha" into udc-dev am: 0814c2dd am: 10c7ddb6 am: c5d6fd4e" into udc-qpr-dev-plus-aosp am: 42caaa16

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



Change-Id: I6d1f2149d52ece187961575534ce0ef00c36c91d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>