Merge "cross-SIM calling: support e911 call on cellular sub" into udc-dev am: 96efb62c83

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

Change-Id: I9df1dd4d0188b3f64412b854f0f3eae50850b94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>