Merge "Throw NPE instead of IllegalArgumentException in SipDelegateManager" am: 5733e616fb am: aff57e7818

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

Change-Id: I1b1685059a876245bee75dc8998636bae0d4f862