Merge "Revert "Use one definition for Octet16"" into main am: 7f0987bc am:...

Merge "Revert "Use one definition for Octet16"" into main am: 7f0987bc am: fd300202 am: 355334bf

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



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