Snap for 11273583 from 8275f475467420fbc6ca595247377d5da568ead7 to mainline-uwb-release

Change-Id: Iefc22e0f608383aa0c2ddb19c8a76856e241373b
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>