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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb09eacd1a2022d597510510195f4d6a67d76d95