Add cleanup to ContentResolverTest to remove some test pollution.

This should fix flakey ContentResolverTest failures in the java 8 build due to test execution orders.