Merge "packetgen: Remove redundant declarations in the generated cxx code" am: 7630740b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2494238



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