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

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

Change-Id: I2a44743bac88ed22b0b9ab59cbcc52943596ff99