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

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

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



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