Merge "Remove usage of a hidden API from ContentResolverTest" into pi-dev