[automerger skipped] Merge "DO NOT MERGE: Allow corner UI to decouple from...

[automerger skipped] Merge "DO NOT MERGE: Allow corner UI to decouple from rounded_corner_radius" into qt-qpr1-dev am: ead4f225 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie1003525dcf0d66a37cd80af234070f3778fa1a4