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: 61022ca0 am: 4073ed57

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

Change-Id: I9ee5e44ec244ea8b0ca28968c23db34b758ecb33