Merge "Support SID/NID redaction in ServiceState"