Merge "Rename attribute dotRadius to avoid conflicts with wear" into nyc-mr1-dev am: 71b3721540 am: 19442f100f
am: 0876ff6eb3

Change-Id: I56478a3b6a832febe0b0fadd294f13134535f3df