[automerger skipped] Merge changes from topics "delegate_regi_new_state_losing_pdn", "ims_rcs_api_improvement_delegate_regi_state" am: a570a8259b am: d8d853ca17 am: 2e41ec38ff am: 33e31518be -s ours

am skip reason: Merged-In Ib3905b5a16a8424fa5c46d4e456087c70437d088 with SHA-1 ffd97a9b81 is already in history

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

Change-Id: I4aefb52334faccb421e6d5d12b59ed4c2b45f719