[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: d5568386 am: e058614d am: f43375ac am: 33d5a120 -s ours

am skip reason: subject contains skip directive

Change-Id: I7412a7bfd3a9ec614e3bc0a509480efc262c3bdc