Merge "bluetooth_packetgen: Minor fixes in generated code" am: 6d039306

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



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