Merge "Throw NPE instead of IllegalArgumentException in SipDelegateManager"