Merge "Add shade radius to systraces" into sc-dev am: 119582ab5f am: 185122125c

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

Change-Id: I252d0b74c63f4d2cccbcb80cff08be2df5b9d55a