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

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

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