Merge "Fix ripple alpha." into tm-qpr-dev am: a0833fb1 am: 2ff395ef

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



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