Merge "Fix concurrent calls occurs when E911 redial happens" am: 53385ecaba am: 65d62301bb

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2033446

Change-Id: If90107ca7524a252e0f611e37efe254de8280bd0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>