Merge "[uwb] Fix failing UwbShellCommand tests in android T" into main