Merge "Add tracing for ContentProviders."