Merge "add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown"