Merge "UWB: Cleanup in default HAL" into main am: ed2acd8952 am: 3b7dd680df

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

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