[automerger skipped] Merge "Remove dependency on Intent for IMS deregistration...

[automerger skipped] Merge "Remove dependency on Intent for IMS deregistration timeout event" am: 4a50cefd am: 728a5b82 -s ours am: 717fd82b -s ours am: 7b27fcb4 -s ours

am skip reason: Merged-In I38fbc2f4fe24b8ad2f6721149e2b7d77fa9d590b with SHA-1 ee4fb0c7 is already in history

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

Change-Id: I0916f5fa15df023b64bfe2576e9b17060d1ec0e4