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

Merge "bluetooth_packetgen:  Minor fixes in generated code" am: 6d039306 am: a232e6d8 am: 2fc59334 am: 51d8fc7d am: e307f8b2

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



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