[automerger skipped] DO NOT MERGE: Allow corner UI to decouple from rounded_corner_radius am: 93158329 -s ours am: dd2bd910 Change-Id: I57798d70abc57f85c28c69a07092d77b9cf68076