Merge "Be consistent with exceptions thrown from ContentResolverCompat.query() DO NOT MERGE" into mnc-dev