[automerger skipped] Merge "Ensure IMS configs are sent properly after IMS...

[automerger skipped] Merge "Ensure IMS configs are sent properly after IMS service crash" into tm-dev am: 9715d77a am: 3b86f012 -s ours

am skip reason: Merged-In I3a601f019df63e8303e552d6c0797ca44a2483c2 with SHA-1 df191ad1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17252553

Change-Id: I68fcd3854d724a7da059a9d7b1ce4e35fda5fe81