Select content uris vs file uris when open or send files

Change-Id: I1e576ccc3d14f9e02bd0148f530133065bfc20bf
JIRA: CYAN-2649
Issue: https://jira.cyanogenmod.org/browse/CYAN-2649
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
CMFM: Fix deadlock

Change-Id: I564b6510550aead6b6abce694a4720e451aa50f4
JIRA: CYAN-2650
Issue: https://jira.cyanogenmod.org/browse/CYAN-2650
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge "CMFM: Fix deadlock" into cm-10.2