Merge "Validate SipMessages have a correct Via branch parameter" am: 71715457e7

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

Change-Id: Ic34dd276714b7c35bba60585a1652ce6a9ede841