Merge "[automerger skipped] Merge "Expose two carrier configs for additional...

Merge "[automerger skipped] Merge "Expose two carrier configs for additional call settings" into main am: 6ab922f1 am: 98cca45e -s ours" into udc-dev-plus-aosp am: d277dadf -s ours

am skip reason: Merged-In I9ae635c051c0f9e180c36aa1725d0f058f1fd70d with SHA-1 c86c69b1 is already in history

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



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