Merge "Add ContentProvider perf tests"