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

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

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