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

* commit '4002d6fdd1255d5d3bd7f32cf3cf68c90ff5e5ed':
  Be consistent with exceptions thrown from ContentResolverCompat.query() DO NOT MERGE