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

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

Change-Id: If43490b66e0cebc616f74812b600ea21c0c5aacb