Fix duplicate entries in ChooserActivity
am: 00e587086b

Change-Id: I3bfed096c104751f80519f72d2d6be1aeacbd109