Merge "[DO NOT MERGE] Fixes CompanionDeviceManagerTest" into rvc-qpr-dev