Merge "Config changes for carrier OXIO" into main am: 2dd06f7b7f Original change: https://android-review.googlesource.com/c/platform/packages/apps/CarrierConfig/+/3475973 Change-Id: Ifabf0782a342d2316fa505b02ce935886564a47b Signed-off-by: Automerger Merge Worker <[email protected]>