Update setting pickers to use default theme for watches. am: ade5eb1bf5
am: 3fbdb3ccc4

Change-Id: I3bcc0ea0c658188d201c58b4d53f83273fc68539