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: I2b97ac08d01f531728572755b353c03953d06386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>