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

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

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