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

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

Change-Id: Ib2775b56fe31c11a6d955f312ab2cb2f52c3f01f