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: 1dfc6b43 am: 20e5c370

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

Change-Id: I9576e980f851a78e75c16d17da3bdc0d4da92d66