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: If8bd68e45a257fbc97df53392db9ddeba784df03