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

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

Change-Id: I3b2a0feafac3c35bf4b341cbbbf7b957211cf75b