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 am: 1e4fc6fe

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



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