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

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

Change-Id: Ie772f7d05a60fc4eefcfbc2cae905a298131b4d7