[automerger skipped] Merge "Set corner radius to 0 when casting" into...

[automerger skipped] Merge "Set corner radius to 0 when casting" into tm-qpr-dev am: 162ed4af -s ours am: 1e714f76 -s ours am: 85997e1f -s ours am: e2a78b52 -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: I1a0b68e1eb01867f29b73fe99b88c681771342b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>