Merge "Change ripple in edit button to circle" into tm-qpr-dev am: 6c7e863e

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



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