Merge "Fix failing RippleShaderTest" into tm-qpr-dev am: cc086f8d am: 6c23ef98

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



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