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

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

Change-Id: I15045fe62ba5346fbef134480b8f9b5ac4a84988