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

Change-Id: If8632e9c3059ad9854ca9299857a00bd97f295f9