Merge "Send the correct mask for service data to the native layer." into main...

Merge "Send the correct mask for service data to the native layer." into main am: d82be229 am: 68c92894

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



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