Merge changes from topic "revert-2959235-cherrypicker-L33900030001926416:N99900030030749140-DOIFHQMKOT" into main am: c4e56edd99

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

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