Merge "Update Switch track in SwitchPreference on watch" into cw-f-dev
am: 604e1f2595

Change-Id: I27a029d72ba323829de34f9db73fdc01ff4a4d30