[automerger skipped] Merge "DO NOT MERGE Add cc so carrier can opt to prefer...

[automerger skipped] 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: 744b2810 am: d20cee6b -s ours

am skip reason: subject contains skip directive

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



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