Merge "Remove rippleFill from RippleShader (last one)." into tm-qpr-dev am: b488504cf3 am: 4dbc9af3ca

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

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