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

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

Change-Id: I57427075675705a05a172e7d04dcf2eb76e4dd23