Merge "Change long screenshot edit button ripple color" into tm-qpr-dev am:...

Merge "Change long screenshot edit button ripple color" into tm-qpr-dev am: 2a984be2 am: bed773bc

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



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