Merge changes from topics "delegate_regi_new_state_losing_pdn", "ims_rcs_api_improvement_delegate_regi_state" am: 5fd9a457ce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1911013

Change-Id: Id4b43dee68b4ebb126dd979415b30097df87fbee