Merge "IMS RCS UCE API Improvement" am: a706df510f am: 321501ea9d

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

Change-Id: Ib83f3c1b02440a05a85a363ad2401a800c2f0a69