Merge "Fix race condition on call initiation" into sc-dev am: 184dbe7cc6

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

Change-Id: I737175f97fefec064737badc79b19982acb7d8f4