[automerger skipped] Merge "Fix ordering of calls when initiating ECT from MMI...

[automerger skipped] Merge "Fix ordering of calls when initiating ECT from MMI code '4'." am: 6f7aa89b -s ours am: 6614703c -s ours am: 76672f66 -s ours am: 27dde6fb -s ours am: 656c6a56 -s ours

am skip reason: Merged-In Ic3b7e85de8dd8c15ed3e60097adb1e0518837263 with SHA-1 5898f44a is already in history

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

Change-Id: I893beafda65fe74228e8a90a020bcd254513a430