Merge "Add a new Config to map PIDF service-description to IMS Feature Tags" am: 3db11be5d7 am: 71b59ace5a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f415cb4105cad6e89c173071938650395cfa673