Merge "Add the ability to send the feature tags associated with IMS registration" am: dd170ee3f3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b5155eb127bfedd6931ebac231691da33e5e2bb