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

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

Change-Id: I409aaa59d0dbff13acbfd35f4f4ffb2955addc5b