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 am: 3d936b79

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

Change-Id: I2962d18f68d8ab7735d03c2d5aee59f0047acce6