Merge "Update setting pickers to use default theme for watches." into cw-f-dev
am: 05ac3f8f59

Change-Id: I894ff9d300435dfdb5782e61b64283b600218fe2