[automerger skipped] Set corner radius to 0 when casting am: ebf85039 -s...

[automerger skipped] Set corner radius to 0 when casting am: ebf85039 -s ours am: 8762a5d6 -s ours

am skip reason: Merged-In I76427c0064c9935c76e3ec8662d6b7955bcbfd2b with SHA-1 ae4dec81 is already in history

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



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