[automerger skipped] Merge "Add requested_corner_radius to layer proto" into sc-v2-dev am: 4eda418d43 am: 6d468258e0 -s ours

am skip reason: Merged-In Ib9f68260f73aff3adc455b5ea8e314a96e514fa7 with SHA-1 abdf4dab40 is already in history

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

Change-Id: Ie8a1ece7f47a2ed7ef5000a3217051a34a1af1c8