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

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

Change-Id: Iac5e5de8516b4f60e5042722593c4e8bfc638885