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

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

Change-Id: Ie89013241cd95ee84f8a9a75b4486b02964cabc9