am 580c30a6: Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev

* commit '580c30a63353f67433da25ef7b90913300e0372f':
  Wire up caller chooser targets for ChooserActivity