[automerger skipped] Merge "Set corner radius to 0 when casting" into tm-qpr-dev am: 162ed4af42 -s ours am: e817290401 -s ours
am skip reason: Merged-In I76427c0064c9935c76e3ec8662d6b7955bcbfd2b with SHA-1 ebf8503944 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22935398
Change-Id: I2bc284cb2237c0450bce07f6b431c2b9cd9b2332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: