Be consistent with exceptions thrown from ContentResolverCompat.query()

On JB+, the framework query() can throw it's own exception.
This CL catches that exception and then throws it's so to maintain
consistency.

BUG: 23203532
Change-Id: I422658dbdaf1cfde7abeac1468b118907e7df705
2 files changed