Merge "Use png for switch in SwitchPreference on watch" into cw-f-dev
am: 40d869222f

Change-Id: I79f87cc0db8eef181f0b727e7532fcec13b1dadc