Merge "Change SipMessage API name" am: e7ae1a9993 am: ebebf3d64e

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1657849

Change-Id: I32d8016299c8f82910623e5c6a65305f8b7ef36e