[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "delegate_regi_new_state_losing_pdn", "ims_rcs_api_improvement_delegate_regi_state" am: 5fd9a457 am: b1e1f7b7 am: cd1a6331 am: 896ec5a9 -s ours

am skip reason: Merged-In I3675c10a6dba55a49174509796c53b07b929c14f with SHA-1 10ca5bcd is already in history

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

Change-Id: I9911656426df2d6b501929da481faba06a2b8ead