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

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

Change-Id: Ifc7a4f2537c87332751715620ba8469eea73cddf