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

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

Change-Id: I54e3a9cb954b3219f62bb9a988453427a23d6d08