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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6c5c084e8897ccc8c589bdc135db589e81fee16