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

Merge "Revert "Use one definition for Octet16"" into main am: 7f0987bc am: 6fe2477a am: 9266a42e

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



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