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

Merge "[automerger skipped] DO NOT MERGE: Allow corner UI to decouple from rounded_corner_radius am: 93158329 -s ours am: dd2bd910 am: 27863681" into rvc-d1-dev-plus-aosp am: 0690b993

Change-Id: Ic6752ffbba654fd2526494925daf5fe4430bf2cf