Merge "Use a typesafe pattern for SIP Delegate configurations" am: 0305ec6109 am: f3e197f2b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682947

Change-Id: Ia97eacf3033851bae9e372745ec2bbfd979ccc68