Fix FileManager Interaction

After much thought about this last night, I decided that we can't
handle making sure the situation in
http://developer.android.com/training/basics/intents/sending.html#StartActivity
can actually be handled without possibly making a bad experience in
other situations (such as FileManager doing its own resolving).

This will now only pop it up when we query a function which could
possibly return the resolver like how it was before  the previous change.

Change-Id: I2e458a80d3e3f7c358949c210b5372933910ac7a
Issue-Id: CYNGNOS-1152
(cherry picked from commit cc2d9285)