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

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

Change-Id: Ib1daec20b74e0225645a53588e72b4f57c78d1cf