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: 5d29a96c am: fd8c8823 am: b480567c

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

Change-Id: Ic259fd9706a65f85becea8db6ad0e4421dd669fc