Merge "Fix issue where surface corner rounding is ignored" into rvc-dev am:...

Merge "Fix issue where surface corner rounding is ignored" into rvc-dev am: a8d1de82 am: 44d73fd7

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

Change-Id: Ie97706954aae1672681a6aad5f7b417fc6e6d837