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