ThemePickerLeaf: Update for U QPR1

* We cannot use ThemePicker_defaults because that
  would make dagger inject ThemePickerInjector
  instead of LeafThemePickerInjector

Change-Id: Idc2b1cfbe456031d434c82bf9b24905ff869ef0e
6 files changed