Merge "Add IwlanCarrierConfig for Default Non-AOSP Carrier Configurations" into main am: 4c84686e45

Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2847273

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