Add support for "double" and "bundle" in pb generating script am: 15640c00bc am: 46ea599a96 am: 7e21d2d5b9 am: 3ea02ef318

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

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