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

Change-Id: I6d81b569998e29e0e7b509d79a1eb6e4ac51cd46