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

Change-Id: Ia258a90198d109f1460932585d1e8a96cbfa7279