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

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

Change-Id: Ia33197ef4466909d748506f152315906606e79fd