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

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

Change-Id: I606215b7aef62ab5d24fd42bf1c984d88a23ca56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>