Merge "Parse params needed for SipDelegate routing" am: 9a13fb1dbf am: b81ca0dc24

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6cb191134894a3b6130dccc7f4b7d3fbcd85c5e3