Merge "DO NOT MERGE Add cc so carrier can opt to prefer an in-service sim for normal ecc call." into udc-qpr-dev am: 744b2810cd

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

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