Merge "Add subid to SipTransportImplBase#createSipDelegate" am: 48695cb073

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

Change-Id: I78ec6fbbf419bbf24916df981769d9e029490778