Merge "Update CompanionDeviceManager owners"