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

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

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



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