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

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

Change-Id: Ib8bacbb9ebdca85546e5e9d71b0aab65f0272903