Merge "UWB: Cleanup in default HAL" into main am: ed2acd8952 am: 3b7dd680df am: 7799f6e754 am: 6a37739667

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2775687

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