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

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

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