[automerger skipped] Merge "IMS RCS UCE API Improvement" am: 1a13024f35 am: 3803f02e41 am: 8dcc53f207 am: e36b1bed1e -s ours

am skip reason: Merged-In I8b28c71ada61af22ba4fee81c140b1c322a29409 with SHA-1 8ea90f36d4 is already in history

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

Change-Id: I6c08558d809310f7a9033d2b352501f029563711