[automerger skipped] Merge "Add a new Config to map PIDF service-description...

[automerger skipped] Merge "Add a new Config to map PIDF service-description to IMS Feature Tags" am: 3db11be5 am: 71b59ace am: 6f9fdc7f -s ours

am skip reason: Change-Id I69a7eed66591841df2c0bef043747b7fff3a48cf with SHA-1 1a17e24d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ff7a9980be99dcc9d8b740ad57b4ad263651c11