Merge "Expose two carrier configs for additional call settings" into main am: 6ab922f1

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



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