Fix Switch in SwitchPreference on watch
am: ba3a1359ba

Change-Id: I4d7d4ecf7dbab7c24abddfca7ac4d33b66591e04