am 31ab86f8: am 06179c75: am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev

* commit '31ab86f871be369075dd3432dcd4ebed14e50a78':
  Handle exceptions when accessing Content providers.