Add support for Bundle typed-carrier config am: 25ebb80023 am: 5861d19e1a

Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/2072472

Change-Id: I21ae6ed9a5f371be2438450f51c55f1d5e307040
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <[email protected]>