Merge "Change SipMessage API name" am: bb05a11104 am: 823b97e3d1 am: a3cc0640c3

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

Change-Id: I8e9738263d1c79e9e9237d767f7ae12b522ef7ee