Fix bug where rounded corners were being set despite being disabled.

Bug: 138117089
Change-Id: Icb852e2e07d80c45ad3406ef432b89720887fccf
(cherry picked from commit e734efba8dc58ea145dc0a620f18cbe2032f70ce)
1 file changed