Merge "Support SID/NID redaction in ServiceState" am: 8fd6876e14

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1978546

Change-Id: I8bc85872b85f4389aa91879f6b5717976bf5470b