Merge "[RCS UCE] Refactor the class RcsContactUceCapability" am: e279b0d14f am: 8774c473ef

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

Change-Id: I86326837c459ac4a8b44889e0622028ecfd6dc6c