[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: e8172904 -s ours am: 54fc71b8 -s ours

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

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



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