[uwb-backend] Merge bug fixes from google3

Test: compiles
Bug: 319865825
Change-Id: Iaad937101349c0a81c7685b8091c577f7948dedd
2 files changed