Merge "ims: Version support for uce feature tags" into sc-dev am: d446e80289 am: a3c93f8051

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

Change-Id: I17d920ef3a0b62cbbd3ba58a05370116f17f21aa