Fix duplicate entries in ChooserActivity am: 00e587086b
am: 8469ffdcc1

Change-Id: I64faa05b9892d38e71c8ebb91d02f5302a4be69e