config: Use carrier config in ROM by default am: 06e99301dd am: 6a0f8557ef

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25616149

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