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

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



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