Merge "Skip CompanionDeviceManagerTest for auto for now" into sc-dev