[automerger skipped] IMS RCS API Improvements-SipDelegate am: 56980ed57e am: 92c4160245 am: 4797987eb1 am: d4b5992e47 -s ours

am skip reason: Merged-In I3c5a7834688e6aa1294f9be7d8a37984c43ed26a with SHA-1 ca77e1c52a is already in history

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

Change-Id: If024d44184eaf2f4aadd7b89332cd88915d1b96b