Merge "Use system server trace tag in Sensitive Content Service" into main