Merge "Propagate exception thrown by ContentProvider.getType" into rvc-dev am: f903ef10 am: 84a2bbf8 Change-Id: Iabc1ea0e689a99609a9f364c0cc06601914d6cb9