Merge "Add carrier configuration items for cross SIM redialing of emergency...

Merge "Add carrier configuration items for cross SIM redialing of emergency calls" into udc-dev am: bb93fbd5 am: e0186b93

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21493084



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