Merge "Update ContentProvider to use the AM trace tag."