Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev