Snap for 8821814 from 9aff0d1d267c849b28ffe0ef7797a62c8132e887 to mainline-go-uwb-release

Change-Id: Ic66f71e848d011ef92524e8b49fbeda720ebc867