Merge "IMS RCS UCE API Improvement" am: 1a13024f35 am: 3803f02e41

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1918220

Change-Id: I3f933796fba51ef4d79cf477771ef8430c533a34