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

Merge "ims: Version support for uce feature tags" into sc-dev am: d446e802 am: a3c93f80 am: 5de7be4e am: 8c29dd2c

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

Change-Id: I07ef70430314ac750bf2eb249ac420daeba00c43