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

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

Change-Id: I20651e9d57bcb31f3a817d4eb0102718b7ffdd14