Merge "Fix CompanionDeviceManagerTest" into sc-v2-dev