Fixes for DATA_MESSAGE_SND am: a39b3547cc

Original change: https://android-review.googlesource.com/c/platform/external/uwb/+/2455888

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