[automerger skipped] Merge "Expose two carrier configs for additional call settings" into main am: 6ab922f1 am: 98cca45e -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: I547caa14149ecd972cf4d66a1ed86fc6b327e914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>