[automerger skipped] Merge "SF: Support xy scaling for rounded corners" into...

[automerger skipped] Merge "SF: Support xy scaling for rounded corners" into tm-qpr-dev am: 43512daf am: b22850c1 -s ours

am skip reason: Merged-In Ie76581eb200a57b847f619f4da0e61758f70dce7 with SHA-1 50c0afe2 is already in history

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



Change-Id: I0862626b554876b2bb8de4f05b779771e67798ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>