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

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

Change-Id: I710dc269f002fb7e912b6392a2d66b6a30cd3064