Be consistent with exceptions thrown from ContentResolverCompat.query() DO NOT MERGE

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
(cherry picked from commit 94d7acd9d29354189ef9c7caeb372363043f7df7)
2 files changed