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

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

Change-Id: I71f35021878cd3e6e451276a9b8c3947f889847b