Merge "Add the ability to get Accept-Contact header params" am: 71a05ba2b4 am: 0c5b322274 am: 1c5ed5e364

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

Change-Id: Ibb8e787a5acdc66049e175954376141efab9e75d