Fix Switch in SwitchPreference on watch am: ba3a1359ba
am: ef1852040a

Change-Id: I7b37244451cdec3f534f26b3cb5188cca925cd78