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

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

Change-Id: Iae7d0c1e64a37e8b76c0e34afe71a6cbc042c27b