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

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

Change-Id: I5db98c8b5e1a48bc8c5d9667b5c198775b6ba9eb