Add support for "double" and "bundle" in pb generating script am: 15640c00bc

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

Change-Id: I018247c7cced1a3775e34efe2391a14a99d8cc6d
Signed-off-by: Automerger Merge Worker <[email protected]>