[automerger skipped] DO NOT MERGE: Allow corner UI to decouple from rounded_corner_radius am: 9315832913 -s ours

am skip reason: subject contains skip directive

Change-Id: I6a3b02e040753795359c17ec3a1c998dff551675